Merge "jquery.tablesorter: use of expand-child class"

diff --combined resources/src/jquery/jquery.tablesorter.js
index 69f8dd8,4a78588..f8216c9
--- 1/resources/src/jquery/jquery.tablesorter.js
--- 2/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@@ -107,6 -107,7 +107,7 @@@
  
        function detectParserForColumn( table, rows, column ) {
                var l = parsers.length,
+                       config = $( table ).data( 'tablesorter' ).config,
                        cellIndex,
                        nodeValue,
                        // Start with 1 because 0 is the fallback parser
@@@ -118,7 -119,8 +119,8 @@@
                        needed = ( rows.length > 4 ) ? 5 : rows.length;
  
                while ( i < l ) {
-                       if ( rows[ rowIndex ] ) {
+                       // if this is a child row, continue to the next row (as buildCache())
+                       if ( rows[ rowIndex ] && !$( rows[ rowIndex ] ).hasClass( config.cssChildRow ) ) {
                                if ( rowIndex !== lastRowIndex ) {
                                        lastRowIndex = rowIndex;
                                        cellIndex = $( rows[ rowIndex ] ).data( 'columnToCell' )[ column ];
@@@ -740,7 -742,7 +742,7 @@@
                                new RegExp( /(https?|ftp|file):\/\// )
                        ],
                        isoDate: [
 -                              new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)([T\s]((([01]\d|2[0-3])(:?[0-5]\d)?|24:?00)?(:?([0-5]\d))?([.,]\d+)?)([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/ ),
 +                              new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)([T\s]((([01]\d|2[0-3])(:?[0-5]\d)?|24:?00)?(:?([0-5]\d|60))?([.,]\d+)?)([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/ ),
                                new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)/ )
                        ],
                        usLongDate: [
@@@ -1165,12 -1167,7 +1167,12 @@@
                                        return $.tablesorter.formatFloat( 0 );
                                }
                        } else {
 -                              isodate = new Date( $.trim( s ) );
 +                              matches = s.match( ts.rgx.isoDate[ 0 ] );
 +                              if ( matches ) {
 +                                      isodate = new Date( $.trim( matches[ 0 ] ) );
 +                              } else {
 +                                      return $.tablesorter.formatFloat( 0 );
 +                              }
                        }
                        return $.tablesorter.formatFloat( ( isodate !== undefined ) ? isodate.getTime() : 0 );
                },